Index: outage/list.jsp
===================================================================
--- outage/list.jsp (revision 6436)
+++ outage/list.jsp (working copy)
@@ -47,10 +47,14 @@
org.opennms.web.acegisecurity.Authentication,
org.opennms.web.outage.filter.*,
org.opennms.web.element.ElementUtil,
+ java.util.Date,
java.text.DateFormat
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+
<%--
This page is written to be the display (view) portion of the OutageQueryServlet
at the /outage/list URL. It will not work by itself, as it requires two request
@@ -120,6 +124,9 @@
<%=this.makeSortLink(request, parms, OutageFactory.SortStyle.IFREGAINEDSERVICE, OutageFactory.SortStyle.REVERSE_IFREGAINEDSERVICE, "time service was regained", "Up")%> |
+
+
+
<% for( int i=0; i < outages.length; i++ ) { %>
@@ -178,7 +185,9 @@
- <%=DATE_FORMAT.format(outages[i].getLostServiceTime())%>
+
+
+
<%=AFTER_ICON%>
<%=BEFORE_ICON%>
|
@@ -187,7 +196,9 @@
<% Date regainedTime = outages[i].getRegainedServiceTime(); %>
<% if(regainedTime != null ) { %>
- <%=DATE_FORMAT.format(outages[i].getRegainedServiceTime())%>
+
+
+
<%=AFTER_ICON%>
<%=BEFORE_ICON%>
|
Index: outage/current.jsp
===================================================================
--- outage/current.jsp (revision 6436)
+++ outage/current.jsp (working copy)
@@ -46,6 +46,8 @@
java.util.*
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%!
protected OutageModel model = new OutageModel();
@@ -130,6 +132,7 @@
Outage ID |
+
<% for( int nodeIndex=0; nodeIndex < nodeList.size(); nodeIndex++ ) { %>
<%
int serviceCnt = ((Integer)servicesPerNodeList.get( nodeIndex )).intValue();
@@ -157,7 +160,10 @@
<% } %>
<%=outage.getServiceName()%> |
- <%=org.opennms.netmgt.EventConstants.formatToUIString(outage.getTimeDown())%> |
+
+
+
+ |
<%=outageId%> |
<% } /* endfor service */ %>
Index: alarm/list-long.jsp
===================================================================
--- alarm/list-long.jsp (revision 6436)
+++ alarm/list-long.jsp (working copy)
@@ -53,6 +53,8 @@
org.opennms.web.alarm.filter.*
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
@@ -274,6 +276,8 @@
<%=this.makeSortLink( parms, AlarmFactory.SortStyle.FIRSTEVENTTIME, AlarmFactory.SortStyle.REVERSE_FIRSTEVENTTIME, "firsteventtime", "First Event Time" )%> |
+
+
<% for( int i=0; i < alarms.length; i++ ) {
Alarm alarm = alarms[i];
pageContext.setAttribute("alarm", alarm);
@@ -365,14 +369,16 @@
<% } %>
- <%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getLastEventTime())%>
+
+
${addAfterFilter}
${addBeforeFilter}
|
- <%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getFirstEventTime())%>
+
+
${addAfterFilter}
${addBeforeFilter}
Index: alarm/list.jsp
===================================================================
--- alarm/list.jsp (revision 6436)
+++ alarm/list.jsp (working copy)
@@ -53,6 +53,8 @@
org.opennms.web.alarm.filter.*
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
@@ -276,6 +278,8 @@
+
+
<% for( int i=0; i < alarms.length; i++ ) {
Alarm alarm = alarms[i];
pageContext.setAttribute("alarm", alarm);
@@ -377,13 +381,15 @@
<% } %>
|
- <%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getLastEventTime())%>
+
+
${addAfterFilter}
${addBeforeFilter}
- <%=org.opennms.netmgt.EventConstants.formatToUIString(alarms[i].getFirstEventTime())%>
+
+
${addAfterFilter}
${addBeforeFilter}
Index: includes/eventlist.jsp
===================================================================
--- includes/eventlist.jsp (revision 6436)
+++ includes/eventlist.jsp (working copy)
@@ -54,9 +54,12 @@
session="true"
import="org.opennms.web.event.*,
org.opennms.web.acegisecurity.Authentication,
- org.opennms.web.MissingParameterException
+ org.opennms.web.MissingParameterException,
+ java.util.Date
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%
//required parameter: node
@@ -171,6 +174,7 @@
<%=header%>
+
<%
for( int i=0; i < events.length; i++ ) {
@@ -185,7 +189,8 @@
<% } %>
- <%=org.opennms.netmgt.EventConstants.formatToUIString(events[i].getTime())%> |
+
+ |
<%=EventUtil.getSeverityLabel(severity)%> |
<%=events[i].getLogMessage()%> |
Index: includes/interfaceOutages-box.jsp
===================================================================
--- includes/interfaceOutages-box.jsp (revision 6436)
+++ includes/interfaceOutages-box.jsp (working copy)
@@ -53,6 +53,8 @@
java.util.*
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%!
OutageModel model = new OutageModel();
@@ -76,6 +78,8 @@
Recent Outages
+
+
<% if(outages.length == 0) { %>
@@ -95,11 +99,13 @@
<% } %>
<%=outages[i].getServiceName()%> |
- <%=EventConstants.formatToUIString(outages[i].getLostServiceTime())%> |
+
+ |
<% if( outages[i].getRegainedServiceTime() == null ) { %>
DOWN |
<% } else { %>
- <%=EventConstants.formatToUIString(outages[i].getRegainedServiceTime())%> |
+
+ |
<% } %>
<%=outages[i].getId()%> |
Index: includes/serviceOutages-box.jsp
===================================================================
--- includes/serviceOutages-box.jsp (revision 6436)
+++ includes/serviceOutages-box.jsp (working copy)
@@ -52,6 +52,8 @@
java.util.*
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%!
OutageModel m_model = new OutageModel();
@@ -76,6 +78,8 @@
Recent Outages
+
+
<% if (outages.length == 0) { %>
There have been no outages on this service in the last 24 hours. |
@@ -87,8 +91,14 @@
<% for(int i=0; i < outages.length; i++) { %>
">
- <%=EventConstants.formatToUIString(outages[i].getLostServiceTime())%> |
- <%=(outages[i].getRegainedServiceTime() == null) ? "DOWN" : EventConstants.formatToUIString(outages[i].getRegainedServiceTime())%> |
+
+ |
+ <% if( outages[i].getRegainedServiceTime() == null ) { %>
+ DOWN |
+ <% } else { %>
+
+ |
+ <% } %>
<%=outages[i].getId()%> |
<% } %>
Index: includes/nodeOutages-box.jsp
===================================================================
--- includes/nodeOutages-box.jsp (revision 6436)
+++ includes/nodeOutages-box.jsp (working copy)
@@ -48,6 +48,8 @@
--%>
<%@page language="java" contentType="text/html" session="true" import="org.opennms.web.outage.*,java.util.*" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%!
OutageModel model = new OutageModel();
@@ -75,6 +77,8 @@
Recent Outages
+
+
<% if(outages.length == 0) { %>
There have been no outages on this node in the last 24 hours. |
@@ -96,12 +100,14 @@
<% } %>
<%=outages[i].getIpAddress()%> |
<%=outages[i].getServiceName()%> |
- <%=org.opennms.netmgt.EventConstants.formatToUIString(outages[i].getLostServiceTime())%> |
+
+ |
<% if( outages[i].getRegainedServiceTime() == null ) { %>
DOWN |
<% } else { %>
- <%=org.opennms.netmgt.EventConstants.formatToUIString(outages[i].getRegainedServiceTime())%> |
+
+ |
<% } %>
<%=outages[i].getId()%> |
Index: event/list.jsp
===================================================================
--- event/list.jsp (revision 6436)
+++ event/list.jsp (working copy)
@@ -54,6 +54,8 @@
org.opennms.web.admin.notification.noticeWizard.*
"
%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
<%--
This page is written to be the display (view) portion of the EventQueryServlet
@@ -262,6 +264,7 @@
Ackd |
+
<% for( int i=0; i < events.length; i++ ) { %>
<% if( !(request.isUserInRole( Authentication.READONLY_ROLE ))) { %>
@@ -284,8 +287,9 @@
<% } %>
+
- <%=org.opennms.netmgt.EventConstants.formatToUIString(events[i].getTime())%>
+
<%=addAfterDateFilterString%>
<%=addBeforeDateFilterString%>
| |